bitkeeper revision 1.1503 (428f1042Yao-1v9mZSxNem0DoJz-Yw)

Fix show_registers() show guest stack or Xen stack, not both.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c
index 0e391a4ea6748067a579d5d517bc73570f0d02bd..2070c8a49d295454b42b25639eaa10e1d7f09295 100644 (file)
--- a/xen/arch/x86/x86_32/traps.c
+++ b/xen/arch/x86/x86_32/traps.c
@@ -78,9 +78,10 @@ void show_registers(struct cpu_user_regs *regs)
            "ss: %04lx   cs: %04lx\n",
            ds, es, fs, gs, ss, cs);
 
-    show_stack((unsigned long *)&regs->esp);
     if ( GUEST_MODE(regs) )
         show_guest_stack();
+    else
+        show_stack((unsigned long *)&regs->esp);
 } 
 
 void show_page_walk(unsigned long addr)

diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index ae9cf424c262ada20a091b867a78611580e20039..4bd093a1dac22b91425c67327cdc9b29225ccd47 100644 (file)
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -23,10 +23,11 @@ void show_registers(struct cpu_user_regs *regs)
     printk("r12: %016lx   r13: %016lx   r14: %016lx   r15: %016lx\n",
            regs->r12, regs->r13, regs->r14, regs->r15);
 
-    show_stack((unsigned long *)regs->rsp);
     if ( GUEST_MODE(regs) )
         show_guest_stack();
-} 
+    else
+        show_stack((unsigned long *)regs->rsp);
+}
 
 void show_page_walk(unsigned long addr)
 {